Produced by Araxis Merge on 2022-11-18 03:12:08 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | Porto Theme/app/design/frontend/Smartwave/porto/Magento_Sales/email | shipment_new.html | 2016-06-21 09:41:00 +0000 |
| 2 | Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Sales/email | shipment_new.html | 2022-11-02 03:47:09 +0000 |
| Description | Between Files 1 and 2 | |
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 16 | 138 |
| Changed | 12 | 34 |
| Inserted | 2 | 6 |
| Removed | 1 | 4 |
| Whitespace | Consecutive whitespace is treated as a single space |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
| Active line-pairing rules |
No regular expressions were active.
| 1 | <!-- | 1 | <!-- | |||
| 2 | /** | 2 | /** | |||
| 3 | * Copyright © 2016 Magento | 3 | * Copyright © | |||
| 4 | * See COPYING.txt for license details. | 4 | * See COPYING.txt for license details. | |||
| 5 | */ | 5 | */ | |||
| 6 | --> | 6 | --> | |||
| 7 | <!--@subject {{trans "Your %store_name order has shipped" store_name=$store.getFrontendName()}} @--> | 7 | <!--@subject {{trans "Your %store_name order has shipped" store_name=$store.frontend_name}} @--> | |||
| 8 | <!--@vars { | 8 | <!--@vars { | |||
| 9 | "var formattedBillingAddress|raw":"Billing Address", | 9 | "var formattedBillingAddress|raw":"Billing Address", | |||
| 10 | "var this.getUrl($store, 'customer/account/' | 10 | "var this.getUrl($store, | |||
| 11 | "var order.getCustomerName()":"Customer Name", | 11 | "var order_data.customer_name":"Customer Name", | |||
| 12 | "var order.increment_id":"Order Id", | 12 | "var order.increment_id":"Order Id", | |||
| 13 | "var payment_html|raw":"Payment Details", | 13 | "var payment_html|raw":"Payment Details", | |||
| 14 | "var comment | 14 | "var comment|escape|nl2br":"Shipment Comment", | |||
| 15 | "var shipment.increment_id":"Shipment Id", | 15 | "var shipment.increment_id":"Shipment Id", | |||
| 16 | "layout handle=\"sales_email_order_shipment_items\" shipment=$shipment order=$order":"Shipment Items Grid", | 16 | "layout handle=\"sales_email_order_shipment_items\" shipment=$shipment order=$order":"Shipment Items Grid", | |||
| 17 | "block class='Magento\\\\Framework\\\\View\\\\Element\\\\Template' area='frontend' template='Magento_Sales::email\/shipment\/track.phtml' shipment=$shipment order=$order":"Shipment Track Details", | 17 | "block class='Magento\\\\Framework\\\\View\\\\Element\\\\Template' area='frontend' template='Magento_Sales::email\/shipment\/track.phtml' shipment=$shipment order=$order":"Shipment Track Details", | |||
| 18 | "var formattedShippingAddress|raw":"Shipping Address", | 18 | "var formattedShippingAddress|raw":"Shipping Address", | |||
| 19 | "var order.shipping_description":"Shipping Description", | 19 | "var order.shipping_description":"Shipping Description", | |||
| 20 | "var order.getShippingDescription()":"Shipping Description" | 20 | "var store.frontend_name":"Store Frontend Name", | |||
| 21 | "var store_phone":"Store Phone", | |||||
| 22 | "var store_email":"Store Email", | |||||
| 23 | "var store_hours":"Store Hours", | |||||
| 24 | "var order_data.is_not_virtual": "Order Type", | |||||
| 25 | "var shipment": "Shipment", | |||||
| 26 | "var order": "Order", | |||||
| 27 | "var order_id": "Order DB Id", | |||||
| 28 | "var shipment_id": "Shipment DB Id" | |||||
| 21 | } @--> | 29 | } @--> | |||
| 22 | {{template config_path="design/email/header_template"}} | 30 | {{template config_path="design/email/header_template"}} | |||
| 23 | 31 | |||||
| 24 | <table> | 32 | <table> | |||
| 25 | <tr class="email-intro"> | 33 | <tr class="email-intro"> | |||
| 26 | <td> | 34 | <td> | |||
| 27 | <p class="greeting">{{trans "%name," name=$order.getCustomerName()}}</p> | 35 | <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p> | |||
| 28 | <p> | 36 | <p> | |||
| 29 | {{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}} | 37 | {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}} | |||
| 30 | {{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}} | 38 | {{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}} | |||
| 39 | {{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}. | |||||
| 40 | {{depend store_hours}} | |||||
| 41 | {{trans 'Our hours are <span class="no-link">%store_hours</span>.' store_hours=$store_hours |raw}} | |||||
| 42 | {{/depend}} | |||||
| 31 | </p> | 43 | </p> | |||
| 32 | <p> | |||||
| 33 | {{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>.' store_email=$store_email |raw}} | |||||
| 34 | </p> | |||||
| 35 | <p>{{trans "Your shipping confirmation is below. Thank you again for your business."}}</p> | |||||
| 36 | </td> | 44 | </td> | |||
| 37 | </tr> | 45 | </tr> | |||
| 38 | <tr class="email-summary"> | 46 | <tr class="email-summary"> | |||
| 39 | <td> | 47 | <td> | |||
| 48 | <p>{{trans "Your shipping confirmation is below. Thank you again for your business."}}</p> | |||||
| 49 | ||||||
| 40 | <h1>{{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$shipment.increment_id order_id=$order.increment_id}}</h1> | 50 | <h1>{{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$shipment.increment_id order_id=$order.increment_id}}</h1> | |||
| 41 | </td> | 51 | </td> | |||
| 42 | </tr> | 52 | </tr> | |||
| 43 | <tr class="email-information"> | 53 | <tr class="email-information"> | |||
| 44 | <td> | 54 | <td> | |||
| 45 | {{depend comment}} | 55 | {{depend comment}} | |||
| 46 | <table class="message-info"> | 56 | <table class="message-info"> | |||
| 47 | <tr> | 57 | <tr> | |||
| 48 | <td> | 58 | <td> | |||
| 49 | {{var comment|escape|nl2br}} | 59 | {{var comment|escape|nl2br}} | |||
| 50 | </td> | 60 | </td> | |||
| 51 | </tr> | 61 | </tr> | |||
| 52 | </table> | 62 | </table> | |||
| 53 | {{/depend}} | 63 | {{/depend}} | |||
| 54 | {{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}} | 64 | {{layout handle="sales_email_order_shipment_track" shipment_id=$shipment_id order_id=$order_id}} | |||
| 55 | <table class="order-details"> | 65 | <table class="order-details"> | |||
| 56 | <tr> | 66 | <tr> | |||
| 57 | <td class="address-details"> | 67 | <td class="address-details"> | |||
| 58 | <h3>{{trans "Billing Info"}}</h3> | 68 | <h3>{{trans "Billing Info"}}</h3> | |||
| 59 | <p>{{var formattedBillingAddress|raw}}</p> | 69 | <p>{{var formattedBillingAddress|raw}}</p> | |||
| 60 | </td> | 70 | </td> | |||
| 61 | {{depend order.getIsNotVirtual()}} | 71 | {{depend order_data.is_not_virtual}} | |||
| 62 | <td class="address-details"> | 72 | <td class="address-details"> | |||
| 63 | <h3>{{trans "Shipping Info"}}</h3> | 73 | <h3>{{trans "Shipping Info"}}</h3> | |||
| 64 | <p>{{var formattedShippingAddress|raw}}</p> | 74 | <p>{{var formattedShippingAddress|raw}}</p> | |||
| 65 | </td> | 75 | </td> | |||
| 66 | {{/depend}} | 76 | {{/depend}} | |||
| 67 | </tr> | 77 | </tr> | |||
| 68 | <tr> | 78 | <tr> | |||
| 69 | <td class="method-info"> | 79 | <td class="method-info"> | |||
| 70 | <h3>{{trans "Payment Method"}}</h3> | 80 | <h3>{{trans "Payment Method"}}</h3> | |||
| 71 | {{var payment_html|raw}} | 81 | {{var payment_html|raw}} | |||
| 72 | </td> | 82 | </td> | |||
| 73 | {{depend order.getIsNotVirtual()}} | 83 | {{depend order_data.is_not_virtual}} | |||
| 74 | <td class="method-info"> | 84 | <td class="method-info"> | |||
| 75 | <h3>{{trans "Shipping Method"}}</h3> | 85 | <h3>{{trans "Shipping Method"}}</h3> | |||
| 76 | <p>{{var order.getShippingDescription()}}</p> | 86 | <p>{{var order.shipping_description}}</p> | |||
| 77 | </td> | 87 | </td> | |||
| 78 | {{/depend}} | 88 | {{/depend}} | |||
| 79 | </tr> | 89 | </tr> | |||
| 80 | </table> | 90 | </table> | |||
| 81 | {{layout handle="sales_email_order_shipment_items" shipment=$shipment order=$order}} | 91 | {{layout handle="sales_email_order_shipment_items" shipment_id=$shipment_id order_id=$order_id}} | |||
| 82 | </td> | 92 | </td> | |||
| 83 | </tr> | 93 | </tr> | |||
| 84 | </table> | 94 | </table> | |||
| 85 | 95 | |||||
| 86 | {{template config_path="design/email/footer_template"}} | 96 | {{template config_path="design/email/footer_template"}} |
Araxis Merge (but not the data content of this report) is Copyright © 1993–2019 Araxis Ltd (www.araxis.com). All rights reserved.